Skip to content

Fix branch filters for PRs from a feature branch (backport #2496) - #2500

Merged
christophfroehlich merged 3 commits into
humblefrom
mergify/bp/humble/pr-2496
Jul 29, 2026
Merged

Fix branch filters for PRs from a feature branch (backport #2496)#2500
christophfroehlich merged 3 commits into
humblefrom
mergify/bp/humble/pr-2496

Conversation

@mergify

@mergify mergify Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

#2086 triggered push and PR events.


This is an automatic backport of pull request #2496 done by Mergify.

(cherry picked from commit 5e2efbb)

# Conflicts:
#	.github/workflows/rolling-coverage-build.yml
#	.github/workflows/rolling-debian-build.yml
#	.github/workflows/rolling-rhel-semi-binary-build.yml
#	.github/workflows/rolling-semi-binary-build-win.yml
@mergify

mergify Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 5e2efbb has failed:

On branch mergify/bp/humble/pr-2496
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 5e2efbb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/rolling-binary-build.yml
	modified:   .github/workflows/rolling-compatibility-humble-binary-build.yml
	modified:   .github/workflows/rolling-compatibility-jazzy-binary-build.yml
	modified:   .github/workflows/rolling-compatibility-kilted-binary-build.yml
	modified:   .github/workflows/rolling-compatibility-lyrical-binary-build.yml
	modified:   .github/workflows/rolling-semi-binary-build.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/rolling-coverage-build.yml
	both modified:   .github/workflows/rolling-debian-build.yml
	both modified:   .github/workflows/rolling-rhel-semi-binary-build.yml
	both modified:   .github/workflows/rolling-semi-binary-build-win.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot added the conflicts label Jul 29, 2026
@christophfroehlich
christophfroehlich merged commit 6534261 into humble Jul 29, 2026
4 checks passed
@christophfroehlich
christophfroehlich deleted the mergify/bp/humble/pr-2496 branch July 29, 2026 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant